From 03970ddcaf7995c6c0b09da717c22ff066b201f4 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 10 Jul 2007 18:00:43 +0000 Subject: [PATCH] Remove work-around for the old tooltips code, and just set the action 2007-07-10 Christian Persch * gtk/gtkaction.c: (gtk_action_sync_tooltip), (gtk_action_set_tooltip): * gtk/gtkuimanager.c: (update_node): Remove work-around for the old tooltips code, and just set the action tooltip immediately on the proxy widget. Bug #455482. svn path=/trunk/; revision=18437 --- ChangeLog | 8 ++++++++ gtk/gtkaction.c | 14 +++++--------- gtk/gtkuimanager.c | 10 ---------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33a8bc24a4..df6f417294 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-07-10 Christian Persch + + * gtk/gtkaction.c: (gtk_action_sync_tooltip), + (gtk_action_set_tooltip): + * gtk/gtkuimanager.c: (update_node): Remove work-around for the old + tooltips code, and just set the action tooltip immediately on the + proxy widget. Bug #455482. + 2007-07-10 Kristian Rietveld * gtk/gtktooltip.c (find_widget_under_pointer), diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 5c257a5bac..49d40c36a5 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -1451,13 +1451,8 @@ static void gtk_action_sync_tooltip (GtkAction *action, GtkWidget *proxy) { - GtkWidget *parent; - - parent = gtk_widget_get_parent (proxy); - - if (GTK_IS_TOOL_ITEM (proxy) && GTK_IS_TOOLBAR (parent)) - gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (proxy), - action->private_data->tooltip); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (proxy), + action->private_data->tooltip); } static void @@ -1475,8 +1470,9 @@ gtk_action_set_tooltip (GtkAction *action, for (p = action->private_data->proxies; p; p = p->next) { proxy = (GtkWidget *)p->data; - - gtk_action_sync_tooltip (action, proxy); + + if (GTK_IS_TOOL_ITEM (proxy)) + gtk_action_sync_tooltip (action, proxy); } g_object_notify (G_OBJECT (action), "tooltip"); diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 687567d3d5..95aa71da67 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -2613,16 +2613,6 @@ update_node (GtkUIManager *self, if (info->proxy) { - /* FIXME: we must re-set the tooltip, since tooltips on - * toolitems can't be set before the toolitem is added - * to the toolbar. - */ - gchar *tooltip; - - g_object_get (G_OBJECT (action), "tooltip", &tooltip, NULL); - g_object_set (G_OBJECT (action), "tooltip", tooltip, NULL); - g_free (tooltip); - g_signal_connect (info->proxy, "notify::visible", G_CALLBACK (update_smart_separators), NULL); } -- 2.30.2